bitkeeper revision 1.352 (3f134f85YWnJ4PLqQ7YFm2Ydbnzh9Q)

Only attempt to access keyboard if SIF_CONSOLE set on domain
+typo fix

diff --git a/xen/drivers/block/xen_block.c b/xen/drivers/block/xen_block.c
index 369cbfe463633649a1fecf1168856791bcfaa1ad..dfacec04952bb1a04e11151f2123480789fb6422 100644 (file)
--- a/xen/drivers/block/xen_block.c
+++ b/xen/drivers/block/xen_block.c
@@ -711,7 +711,7 @@ static void dispatch_rw_block_io(struct task_struct *p, int index)
            phys_seg[nr_psegs].dev           = xendev_to_physdev(req->device);
             if ( phys_seg[nr_psegs].dev == 0 ) 
            {
-               DPRINTK("bad device: %04x\n", req_device);
+               DPRINTK("bad device: %04x\n", req->device);
                goto bad_descriptor;
            }
             new_segs = 1;

diff --git a/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h b/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h
index 263aa595a1b5ef7efad0f0469828ecde17301434..e8a3905b7bbdc3ea94804e040a0378c9fb33201e 100644 (file)
--- a/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h
+++ b/xenolinux-2.4.21-sparse/include/asm-xeno/keyboard.h
@@ -52,6 +52,19 @@ extern unsigned char pckbd_sysrq_xlate[128];
 #include <asm/hypervisor-ifs/kbd.h>
 #include <asm/hypervisor-ifs/hypervisor-if.h>
 
+#define kbd_controller_present xen_kbd_controller_present
+
+static inline int xen_kbd_controller_present ()
+{
+       if( start_info.flags & SIF_CONSOLE )
+               {
+               printk("Enable keyboard\n");
+               return 1;
+               }
+       else
+               return 0;
+}
+
 /* resource allocation */
 #define kbd_request_region() do { } while (0)
 #define kbd_request_irq(handler) request_irq(_EVENT_KBD, handler, 0, "PS/2 kbd", NULL)
@@ -68,7 +81,7 @@ static unsigned char kbd_current_scancode = 0;
 
 static unsigned char kbd_read_input(void) 
 {
-  //printk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode);
+  //xprintk("kbd_read_input: returning scancode 0x%2x\n", kbd_current_scancode);
   return kbd_current_scancode;
 }